Be more robust when removing the current page. (#499951, Andreas Sandberg)

2008-01-07  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkassistant.c (remove_page): Be more robust when removing
        the current page.  (#499951, Andreas Sandberg)

svn path=/trunk/; revision=19321

diff --git a/ChangeLog b/ChangeLog
index 567cffa8f5b1b5912ec5a2cbfddde529f4211003..19c88b7429bb762c034cd5955ad44a21b23ea977 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkassistant.c (remove_page): Be more robust when removing 
+       the current page.  (#499951, Andreas Sandberg)
+
 2008-01-06  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtkspinbutton.c: Declare value in the example code for

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 90c6f2a07502bc1bc14ef2a0174d47a30fb50ee6..14fa31aff375d754b37acd48abd39b4ddb72d1e5 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -869,6 +869,9 @@ remove_page (GtkAssistant *assistant,
          while (page_node && !GTK_WIDGET_VISIBLE (((GtkAssistantPage *) page_node->data)->page))
            page_node = page_node->next;
 
+          if (page_node == element)
+            page_node = page_node->next;
+
          if (page_node)
            priv->current_page = page_node->data;
          else